Autogenerated HTML docs for v1.5.3.5-726-g41a7a
diff --git a/diff-options.txt b/diff-options.txt index b1f528a..e4af393 100644 --- a/diff-options.txt +++ b/diff-options.txt
@@ -1,5 +1,25 @@ +// Please don't remove this comment as asciidoc behaves badly when +// the first non-empty line is ifdef/ifndef. The symptom is that +// without this comment the <git-diff-core> attribute conditionally +// defined below ends up being defined unconditionally. +// Last checked with asciidoc 7.0.2. + +ifndef::git-format-patch[] +ifndef::git-diff[] +:git-diff-core: 1 +endif::git-diff[] +endif::git-format-patch[] + +ifdef::git-format-patch[] -p:: - Generate patch (see section on generating patches) + Generate patches without diffstat. +endif::git-format-patch[] + +ifndef::git-format-patch[] +-p:: + Generate patch (see section on generating patches). + {git-diff? This is the default.} +endif::git-format-patch[] -u:: Synonym for "-p". @@ -13,6 +33,7 @@ --raw:: Generate the raw format. + {git-diff-core? This is the default.} --patch-with-raw:: Synonym for "-p --raw". @@ -41,6 +62,7 @@ --patch-with-stat:: Synonym for "-p --stat". + {git-format-patch? This is the default.} -z:: NUL-line termination on output. This affects the --raw diff --git a/git-diff-files.html b/git-diff-files.html index 7c905ea..b3bfaa4 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -289,7 +289,8 @@ </dt> <dd> <p> - Generate patch (see section on generating patches) + Generate patch (see section on generating patches). + </p> </dd> <dt> @@ -323,6 +324,7 @@ <dd> <p> Generate the raw format. + This is the default. </p> </dd> <dt> @@ -381,6 +383,7 @@ <dd> <p> Synonym for "-p --stat". + </p> </dd> <dt> @@ -1114,7 +1117,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 14-Nov-2007 12:11:27 UTC +Last updated 16-Nov-2007 10:10:37 UTC </div> </div> </body>
diff --git a/git-diff-index.html b/git-diff-index.html index 9459e42..a511a26 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -290,7 +290,8 @@ </dt> <dd> <p> - Generate patch (see section on generating patches) + Generate patch (see section on generating patches). + </p> </dd> <dt> @@ -324,6 +325,7 @@ <dd> <p> Generate the raw format. + This is the default. </p> </dd> <dt> @@ -382,6 +384,7 @@ <dd> <p> Synonym for "-p --stat". + </p> </dd> <dt> @@ -1196,7 +1199,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 14-Nov-2007 12:11:28 UTC +Last updated 16-Nov-2007 10:10:37 UTC </div> </div> </body>
diff --git a/git-diff-tree.html b/git-diff-tree.html index b80da2d..5827671 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -292,7 +292,8 @@ </dt> <dd> <p> - Generate patch (see section on generating patches) + Generate patch (see section on generating patches). + </p> </dd> <dt> @@ -326,6 +327,7 @@ <dd> <p> Generate the raw format. + This is the default. </p> </dd> <dt> @@ -384,6 +386,7 @@ <dd> <p> Synonym for "-p --stat". + </p> </dd> <dt> @@ -1584,7 +1587,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 14-Nov-2007 12:11:28 UTC +Last updated 16-Nov-2007 10:10:38 UTC </div> </div> </body>
diff --git a/git-diff.html b/git-diff.html index 7820ac2..3b7e36e 100644 --- a/git-diff.html +++ b/git-diff.html
@@ -368,7 +368,8 @@ </dt> <dd> <p> - Generate patch (see section on generating patches) + Generate patch (see section on generating patches). + This is the default. </p> </dd> <dt> @@ -402,6 +403,7 @@ <dd> <p> Generate the raw format. + </p> </dd> <dt> @@ -460,6 +462,7 @@ <dd> <p> Synonym for "-p --stat". + </p> </dd> <dt> @@ -1311,7 +1314,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 14-Nov-2007 12:11:29 UTC +Last updated 16-Nov-2007 10:10:38 UTC </div> </div> </body>
diff --git a/git-diff.txt b/git-diff.txt index 11c4216..2808a5e 100644 --- a/git-diff.txt +++ b/git-diff.txt
@@ -75,6 +75,7 @@ OPTIONS ------- +:git-diff: 1 include::diff-options.txt[] <path>...::
diff --git a/git-format-patch.html b/git-format-patch.html index 2126e92..b09edc6 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -337,7 +337,7 @@ </dt> <dd> <p> - Generate patch (see section on generating patches) + Generate patches without diffstat. </p> </dd> <dt> @@ -371,6 +371,7 @@ <dd> <p> Generate the raw format. + </p> </dd> <dt> @@ -429,6 +430,7 @@ <dd> <p> Synonym for "-p --stat". + This is the default. </p> </dd> <dt> @@ -989,7 +991,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 15-Nov-2007 00:12:54 UTC +Last updated 16-Nov-2007 10:10:39 UTC </div> </div> </body>
diff --git a/git-format-patch.txt b/git-format-patch.txt index 9d4bae2..6fb9429 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt
@@ -66,6 +66,7 @@ OPTIONS ------- +:git-format-patch: 1 include::diff-options.txt[] -<n>::
diff --git a/git-ls-files.html b/git-ls-files.html index 8689cde..4aeeb38 100644 --- a/git-ls-files.html +++ b/git-ls-files.html
@@ -279,6 +279,7 @@ [-x <pattern>|--exclude=<pattern>] [-X <file>|--exclude-from=<file>] [--exclude-per-directory=<file>] + [--exclude-standard] [--error-unmatch] [--with-tree=<tree-ish>] [--full-name] [--abbrev] [--] [<file>]*</div></div> </div> @@ -412,6 +413,15 @@ </p> </dd> <dt> +--exclude-standard +</dt> +<dd> +<p> + Add the standard git exclusions: .git/info/exclude, .gitignore + in each directory, and the user's global exclusion file. +</p> +</dd> +<dt> --error-unmatch </dt> <dd> @@ -615,7 +625,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 14-Nov-2007 12:11:35 UTC +Last updated 16-Nov-2007 10:10:40 UTC </div> </div> </body>
diff --git a/git-ls-files.txt b/git-ls-files.txt index 9e454f0..2ec0c0d 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt
@@ -15,6 +15,7 @@ [-x <pattern>|--exclude=<pattern>] [-X <file>|--exclude-from=<file>] [--exclude-per-directory=<file>] + [--exclude-standard] [--error-unmatch] [--with-tree=<tree-ish>] [--full-name] [--abbrev] [--] [<file>]\* @@ -77,6 +78,10 @@ read additional exclude patterns that apply only to the directory and its subdirectories in <file>. +--exclude-standard:: + Add the standard git exclusions: .git/info/exclude, .gitignore + in each directory, and the user's global exclusion file. + --error-unmatch:: If any <file> does not appear in the index, treat this as an error (return 1).
